From: Keir Fraser <keir@xen.org>
Date: Tue, 9 Nov 2010 11:50:37 +0000 (+0000)
Subject: ia64: fix the build (again)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11266
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=bc01a5837a03ffdd00a2ae790fe7aa84007a02d1;p=xen.git

ia64: fix the build (again)

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/xen/drivers/passthrough/vtd/ia64/vtd.c b/xen/drivers/passthrough/vtd/ia64/vtd.c
index 4364c55648..5ff7623739 100644
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c
@@ -27,6 +27,7 @@
 #include <asm/sal.h>
 #include "../iommu.h"
 #include "../dmar.h"
+#include "../extern.h"
 #include "../vtd.h"
 
 
diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c
index c84f59aa6f..e327648133 100644
--- a/xen/drivers/passthrough/vtd/quirks.c
+++ b/xen/drivers/passthrough/vtd/quirks.c
@@ -119,8 +119,12 @@ static void map_igd_reg(void)
     igd_reg = (igd_mmio & IGD_BAR_MASK) + 0x2000;
 
     /* ioremap this physical page */
+#if defined(CONFIG_X86)
     set_fixmap_nocache(FIX_IGD_MMIO, igd_reg);
     igd_reg_va = (u8 *)fix_to_virt(FIX_IGD_MMIO);
+#else
+    igd_reg_va = ioremap_nocache(igd_reg, 0x100);
+#endif
 }
 
 /*
diff --git a/xen/include/asm-ia64/hvm/vacpi.h b/xen/include/asm-ia64/hvm/vacpi.h
index 44c4e81bbc..764aad3e8a 100644
--- a/xen/include/asm-ia64/hvm/vacpi.h
+++ b/xen/include/asm-ia64/hvm/vacpi.h
@@ -24,10 +24,6 @@
 #include <public/arch-ia64/hvm/save.h> /* for struct vacpi_regs */
 #include <public/hvm/ioreq.h>
 
-#define ACPI_PM1A_EVT_BLK_ADDRESS 0x0000000000001f40
-#define ACPI_PM1A_CNT_BLK_ADDRESS (ACPI_PM1A_EVT_BLK_ADDRESS + 0x04)
-#define ACPI_PM_TMR_BLK_ADDRESS   (ACPI_PM1A_EVT_BLK_ADDRESS + 0x08)
-
 #define IS_ACPI_ADDR(X)  ((unsigned long)((X)-ACPI_PM1A_EVT_BLK_ADDRESS)<12)
 
 #define FREQUENCE_PMTIMER  3579545UL	/* Timer should run at 3.579545 MHz */